Merge.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 3 Aug 2010 20:03:09 +0000 (21:03 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 3 Aug 2010 20:03:09 +0000 (21:03 +0100)
commitc8acaf6985c4c6e98960e65bf532298b44c0ace9
treed9aa179c8f3dc65ddf7519b983d3175005f803bf
parent3ce7199378b9565ac31d1a9951cd9d8925b09dbb
parent4fb44903e86bf86823e46cc37482ff1387af3d59
Merge.